merge.
authorIan Campbell <ian.campbell@xensource.com>
Tue, 22 Aug 2006 10:34:46 +0000 (11:34 +0100)
committerIan Campbell <ian.campbell@xensource.com>
Tue, 22 Aug 2006 10:34:46 +0000 (11:34 +0100)

Trivial merge